Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update AEM dependencies to 6.5.10 #3081

Merged
merged 15 commits into from
Jun 10, 2023
Merged

Update AEM dependencies to 6.5.10 #3081

merged 15 commits into from
Jun 10, 2023

Conversation

kwin
Copy link
Contributor

@kwin kwin commented Apr 2, 2023

No description provided.

@kwin kwin requested a review from davidjgonzalez April 2, 2023 15:30
@kwin kwin force-pushed the feature/update-aem-dependencies branch 2 times, most recently from ef801b4 to 1658557 Compare April 2, 2023 15:43
@kwin kwin force-pushed the feature/update-aem-dependencies branch from 1658557 to 3437996 Compare April 2, 2023 17:13
@codecov
Copy link

codecov bot commented Apr 2, 2023 •
edited
Loading

Codecov Report

Merging #3081 (ec760dd) into master (3edec67) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

❗ Current head ec760dd differs from pull request most recent head 2a5ce27. Consider uploading reports for the commit 2a5ce27 to get more accurate results

@@             Coverage Diff              @@
##             master    #3081      +/-   ##
============================================
- Coverage     55.19%   55.18%   -0.01%     
  Complexity     5404     5404              
============================================
  Files           711      711              
  Lines         28989    28988       -1     
  Branches       3745     3745              
============================================
- Hits          16000    15997       -3     
- Misses        11485    11488       +3     
+ Partials       1504     1503       -1
Impacted Files Coverage Δ
...be/acs/commons/oakpal/checks/ImportedPackages.java 95.78% <100.00%> (-0.03%) ⬇️

... and 1 file with indirect coverage changes

@kwin
Copy link
Contributor Author

kwin commented Apr 2, 2023

Testing with JDK17 still fails for some reason....

@royteeuwen
Copy link
Contributor

@kwin does that mean there are already plans known about AEM supporting JDK 17?

@kwin
Copy link
Contributor Author

kwin commented Apr 4, 2023

@royteeuwen No, it doesn't. Just a regression with tests executed with new dependencies on Java 17 which worked with older versions. Most probably related to #2964 (comment).

davidjgonzalez
davidjgonzalez requested changes Apr 21, 2023
View reviewed changes
Copy link
Contributor

@davidjgonzalez davidjgonzalez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GActions are failing

@kwin
Copy link
Contributor Author

kwin commented Apr 21, 2023

GActions are failing

Yes, I know, compare with #3081 (comment). Any pointers appreciated.

kwin added 2 commits May 16, 2023 18:46
@kwin
Exclude Jackrabbit API from test scope
078d930 
Update OSGi Converter to 1.0.9 as older versions are not compatible with
Java 12+
@kwin
Merge branch 'feature/update-aem-dependencies' of [email protected]:Adob…
165f014 
…e-Consulting-Services/acs-aem-commons.git into feature/update-aem-dependencies
@kwin
Copy link
Contributor Author

kwin commented May 16, 2023 •
edited
Loading

@stefanseifert Any chance you have an idea why the RemoteAssetDecoratorTest fails with newer dependencies? It seems that the RemoteAssetDecorator being registered in RemoteAssetDecoratorTest.setupFinish() is never bound as ResourceDecorator in https://github.com/apache/sling-org-apache-sling-resourceresolver/blob/46f67c7cff13071d96cf58dde86730b6ffbb2639/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java#L609....

Update: I created https://issues.apache.org/jira/browse/SLING-11885 to track that

@kwin kwin force-pushed the feature/update-aem-dependencies branch from b45c1d0 to 0d87654 Compare May 17, 2023 17:00
@kwin kwin requested a review from davidjgonzalez May 17, 2023 17:40
kwin
kwin commented May 17, 2023
View reviewed changes
pom.xml Show resolved Hide resolved
@davidjgonzalez davidjgonzalez added the Skip-Changelog Skips the check for a changelog entry in the CI build label Jun 2, 2023
@kwin
Copy link
Contributor Author

kwin commented Jun 10, 2023

@davidjgonzalez Anything outstanding here?

@davidjgonzalez davidjgonzalez requested review from davidjgonzalez and removed request for davidjgonzalez June 10, 2023 11:59
@davidjgonzalez davidjgonzalez merged commit 3698e61 into master Jun 10, 2023
@davidjgonzalez
Copy link
Contributor

Nope! I must have missed it on last release! Merged

@kwin kwin deleted the feature/update-aem-dependencies branch June 10, 2023 12:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidjgonzalez davidjgonzalez Awaiting requested review from davidjgonzalez

Assignees
No one assigned
Labels
Skip-Changelog Skips the check for a changelog entry in the CI build
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@kwin @royteeuwen @davidjgonzalez